(rmail-retry-ignored-headers): Add usual mime headers.

(rmail-retry-failure): Undo previous change.

diff --git a/lisp/mail/rmail.el b/lisp/mail/rmail.el
index 32349dbb0f0621a9ebbf613c86e8ca815569d8fe..053f88629ff416f8dcb7e3e8140707261db42832 100644 (file)
--- a/lisp/mail/rmail.el
+++ b/lisp/mail/rmail.el
@@ -371,7 +371,7 @@ If nil, display all header fields except those matched by
   :group 'rmail-headers)
 
 ;;;###autoload
-(defcustom rmail-retry-ignored-headers "^x-authentication-warning:"
+(defcustom rmail-retry-ignored-headers "^x-authentication-warning:\\|content-type:\\|content-transfer-encoding:\\|mime-version:"
   "Headers that should be stripped when retrying a failed message."
   :type '(choice regexp (const nil :tag "None"))
   :group 'rmail-headers)
@@ -3762,7 +3762,6 @@ specifying headers which should not be copied into the new message."
            (mail-sendmail-delimit-header)
            (save-restriction
              (narrow-to-region (point-min) (mail-header-end))
-             (rmail-delete-headers rmail-ignored-headers)
              (rmail-delete-headers rmail-retry-ignored-headers)
              (rmail-delete-headers "^\\(sender\\|return-path\\|received\\):")
              (setq resending (mail-fetch-field "resent-to"))